Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Jul 2010 22:54:46 +0000 (22:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Jul 2010 22:54:46 +0000 (22:54 +0000)
commit7f9285f8582071fce304dadcb0b161327c965ab6
treeea4acf5795079ec6cf0872be9fbcbe92b0fd765b
parent9883214abd8096946e48aa9e9139c00f7ff1951f
parentd24dff2b4044ead9c61b0705d31041c705782756
Merge from mainline.